Added example config entries for xend-tcp-xmlrpc-server and

xend-unix-xmlrpc-server.  Deprecate the SXP-based servers, and disable them
by default.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/examples/xend-config.sxp b/tools/examples/xend-config.sxp
index f9ed5642d5a533bdf27c8b95c57b0ef2755e1a01..7dd74f793a9ab736179d4ae3df21c9eecae66537 100644 (file)
--- a/tools/examples/xend-config.sxp
+++ b/tools/examples/xend-config.sxp
@@ -15,7 +15,9 @@
 #(loglevel DEBUG)
 
 #(xend-http-server no)
-#(xend-unix-server yes)
+#(xend-unix-server no)
+#(xend-tcp-xmlrpc-server no)
+#(xend-unix-xmlrpc-server yes)
 #(xend-relocation-server no)
 (xend-relocation-server yes)
 

diff --git a/tools/python/xen/xend/XendRoot.py b/tools/python/xen/xend/XendRoot.py
index f5e716b8307b702edfab134376238ddc40a7b4ff..dc3e64f38ca2791e3cefc44c096283188a10e0ce 100644 (file)
--- a/tools/python/xen/xend/XendRoot.py
+++ b/tools/python/xen/xend/XendRoot.py
@@ -57,7 +57,8 @@ class XendRoot:
     """Default level of information to be logged."""
     loglevel_default = 'DEBUG'
 
-    """Default for the flag indicating whether xend should run an http server."""
+    """Default for the flag indicating whether xend should run an http server
+    (deprecated)."""
     xend_http_server_default = 'no'
 
     xend_tcp_xmlrpc_server_default = 'no'
@@ -81,8 +82,9 @@ class XendRoot:
 
     xend_relocation_hosts_allow_default = ''
 
-    """Default for the flag indicating whether xend should run a unix-domain server."""
-    xend_unix_server_default = 'yes'
+    """Default for the flag indicating whether xend should run a unix-domain
+    server (deprecated)."""
+    xend_unix_server_default = 'no'
 
     """Default path the unix-domain server listens at."""
     xend_unix_path_default = '/var/lib/xend/xend-socket'